[PATCH 1/2] control: default to no Multi-Arch value for 'bin' package

'allowed' should be the exception, not the default.

Fixes: #1103920
Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
Gbp-Pq: Name 0001-control-default-to-no-Multi-Arch-value-for-bin-packa.patch

diff --git a/src/debian/control.rs b/src/debian/control.rs
index c48147fef96facd296ec99f7afc7589fdfa11141..be745e7528b63b0981dbf402139a1d4b0dd22d06 100644 (file)
--- a/src/debian/control.rs
+++ b/src/debian/control.rs
@@ -35,7 +35,7 @@ pub struct Source {
 pub struct Package {
     name: String,
     arch: String,
-    multi_arch: String,
+    multi_arch: Option<String>,
     section: Option<String>,
     depends: Vec<String>,
     recommends: Vec<String>,
@@ -126,7 +126,9 @@ impl fmt::Display for Package {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         writeln!(f, "Package: {}", self.name)?;
         writeln!(f, "Architecture: {}", self.arch)?;
-        writeln!(f, "Multi-Arch: {}", self.multi_arch)?;
+        if let Some(ref multi_arch) = self.multi_arch {
+            writeln!(f, "Multi-Arch: {}", multi_arch)?;
+        }
         if let Some(section) = &self.section {
             writeln!(f, "Section: {}", section)?;
         }
@@ -452,7 +454,7 @@ impl Package {
             // duplicate packages in the Debian archive. For very large crates we
             // will eventually want to make debcargo generate -data packages that
             // are arch:all and have the arch:any -dev packages depend on it.
-            multi_arch: "same".to_string(),
+            multi_arch: Some("same".to_string()),
             section: None,
             depends,
             recommends,
@@ -485,7 +487,7 @@ impl Package {
         Package {
             name,
             arch: "any".to_string(),
-            multi_arch: "allowed".to_string(),
+            multi_arch: None,
             section: section.map(|s| s.to_string()),
             depends: vec![
                 "${misc:Depends}".to_string(),

diff --git a/src/debian/control/tests.rs b/src/debian/control/tests.rs
index bfad24b8fb7e0fbd92ac4ed60cbdeb4835796207..f1d16cc573d5faa8a7174c75a24651edfa0fea5a 100644 (file)
--- a/src/debian/control/tests.rs
+++ b/src/debian/control/tests.rs
@@ -136,7 +136,7 @@ fn test_package_new() {
     assert!(instance.is_ok());
     let instance = instance.unwrap();
     assert_eq!("any", instance.arch);
-    assert_eq!("same", instance.multi_arch);
+    assert_eq!(Some("same"), instance.multi_arch.as_deref());
     assert_eq!(None, instance.section);
     assert_eq!(vec!["${misc:Depends}"], instance.depends);
     assert_eq!(Vec::<String>::new(), instance.recommends);
@@ -167,7 +167,7 @@ fn test_package_new_bin() {
     let instance = Package::new_bin(basename, name_suffix, section, summary, description);
 
     assert_eq!("any", instance.arch);
-    assert_eq!("allowed", instance.multi_arch);
+    assert_eq!(None, instance.multi_arch);
     assert_eq!(Some("rust".to_owned()), instance.section);
     assert_eq!(
         vec!["${misc:Depends}", "${shlibs:Depends}", "${cargo:Depends}"],
@@ -201,7 +201,7 @@ fn test_package_display() {
     );
     let instance = Package::new_bin(basename, name_suffix, section, summary, description);
 
-    let expected = "Package: rsa\nArchitecture: any\nMulti-Arch: allowed\nSection: rust\nDepends:\n ${misc:Depends},\n ${shlibs:Depends},\n ${cargo:Depends}\nRecommends:\n ${cargo:Recommends}\nSuggests:\n ${cargo:Suggests}\nProvides:\n ${cargo:Provides}\nBuilt-Using: ${cargo:Built-Using}\nStatic-Built-Using: ${cargo:Static-Built-Using}\nDescription: \n description_start\n .\n empty lines\n .\n description_stop\n";
+    let expected = "Package: rsa\nArchitecture: any\nSection: rust\nDepends:\n ${misc:Depends},\n ${shlibs:Depends},\n ${cargo:Depends}\nRecommends:\n ${cargo:Recommends}\nSuggests:\n ${cargo:Suggests}\nProvides:\n ${cargo:Provides}\nBuilt-Using: ${cargo:Built-Using}\nStatic-Built-Using: ${cargo:Static-Built-Using}\nDescription: \n description_start\n .\n empty lines\n .\n description_stop\n";
 
     assert_eq!(expected, instance.to_string());
 }